shell: Define COGL_ENABLE_EXPERIMENTAL_API and related defines globally

This allows us to use new Cogl APIs without having to define things in
every .c/.h file manually.

diff --git a/src/Makefile-st.am b/src/Makefile-st.am
index 721253ed47b76934db47e7ddfbe0f606aba02278..db6cd8f1227fcf61f3517b1a17c9328eab984916 100644 (file)
--- a/src/Makefile-st.am
+++ b/src/Makefile-st.am
@@ -4,6 +4,8 @@ st_cflags =                                     \
        -DLIBDIR=\""$(libdir)"\"                \
        -DG_LOG_DOMAIN=\"St\"                   \
        -DST_COMPILATION                        \
+       -DCLUTTER_ENABLE_EXPERIMENTAL_API       \
+       -DCOGL_ENABLE_EXPERIMENTAL_API          \
        -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\"    \
        $(ST_CFLAGS)                            \
        $(NULL)

diff --git a/src/Makefile.am b/src/Makefile.am
index da61ad5f3914f1f277b42d78549acac9b9ea062a..abffd8902c81700e5e12cbd3004c37da10a391ea 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -61,6 +61,8 @@ include Makefile-hotplug-sniffer.am
 gnome_shell_cflags =                           \
        $(GNOME_SHELL_CFLAGS)                   \
        -I$(srcdir)/tray                        \
+       -DCLUTTER_ENABLE_EXPERIMENTAL_API       \
+       -DCOGL_ENABLE_EXPERIMENTAL_API          \
        -DVERSION=\"$(VERSION)\"                \
        -DLOCALEDIR=\"$(datadir)/locale\"       \
        -DDATADIR=\"$(datadir)\"                \

diff --git a/src/gnome-shell-plugin.c b/src/gnome-shell-plugin.c
index b1a704ace5afac4f56e0c3fd62dc8101c42cee67..f7dd1be603852eee438a8f6a50bea3f0ad16a327 100644 (file)
--- a/src/gnome-shell-plugin.c
+++ b/src/gnome-shell-plugin.c
@@ -26,8 +26,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define CLUTTER_ENABLE_EXPERIMENTAL_API
-#define COGL_ENABLE_EXPERIMENTAL_API
 #include <clutter/clutter.h>
 #include <clutter/x11/clutter-x11.h>
 #include <gjs/gjs.h>

diff --git a/src/shell-glsl-quad.c b/src/shell-glsl-quad.c
index 22edc92383c37ea27352e42118daec751229054f..c37f73838dd42eaab38089bf6ea5e7308d8468d0 100644 (file)
--- a/src/shell-glsl-quad.c
+++ b/src/shell-glsl-quad.c
@@ -13,9 +13,6 @@
 
 #include "config.h"
 
-#define CLUTTER_ENABLE_EXPERIMENTAL_API
-#define COGL_ENABLE_EXPERIMENTAL_API
-
 #include <cogl/cogl.h>
 #include "shell-glsl-quad.h"
 

diff --git a/src/shell-invert-lightness-effect.h b/src/shell-invert-lightness-effect.h
index a7bedd5d1d20a4d23477162d5e0d6b387c1761c2..3d7cf3a6d665ee1b50b0712fd946d29a4e6be5e1 100644 (file)
--- a/src/shell-invert-lightness-effect.h
+++ b/src/shell-invert-lightness-effect.h
@@ -21,7 +21,6 @@
 #ifndef __SHELL_INVERT_LIGHTNESS_EFFECT_H__
 #define __SHELL_INVERT_LIGHTNESS_EFFECT_H__
 
-#define COGL_ENABLE_EXPERIMENTAL_API
 #include <clutter/clutter.h>
 
 G_BEGIN_DECLS

diff --git a/src/shell-screenshot.c b/src/shell-screenshot.c
index 02d4e1503b5ffa9db7e146912ee4397e58fb9c72..f637aa9566f3dbdbb4ce1b9686b83c15183d9908 100644 (file)
--- a/src/shell-screenshot.c
+++ b/src/shell-screenshot.c
@@ -1,8 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
-#define COGL_ENABLE_EXPERIMENTAL_API
-#define CLUTTER_ENABLE_EXPERIMENTAL_API
-
 #include <clutter/clutter.h>
 #include <cogl/cogl.h>
 #include <meta/display.h>

diff --git a/src/st/st-texture-cache.c b/src/st/st-texture-cache.c
index 51f54498fb6dc70df7f8fdbe133b6d77e5d3e74f..ff65915d6ef7a9a70b2bc626b5f158aaa502e202 100644 (file)
--- a/src/st/st-texture-cache.c
+++ b/src/st/st-texture-cache.c
@@ -21,8 +21,6 @@
 
 #include "config.h"
 
-#define COGL_ENABLE_EXPERIMENTAL_API /* for cogl_framebuffer_allocate */
-
 #include "st-texture-cache.h"
 #include "st-private.h"
 #include <gtk/gtk.h>